From be4111d537d5d08781343d23c5edac9880f46183 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 8 Feb 2018 18:29:39 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 449913 -> 450641 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 4781d02af81..89370213450 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -849,7 +849,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 439d397eca6a13c19e2e8edbbf44f4b0d06b407d..30dd83d424e1b9ddbb34d24a19bd70485ad4164d 100644
GIT binary patch
delta 572
zcmY*VO=uHA6lU^vlg(nax~py4)J&FI6}q-XJ*X_CS}4YYg6P2#!kTW|Xi3n-hzQb4
z&8alHKOYJTBE8guC`v&PdJ#N$@zf$Bx!Hqgul3|4rhyK8%$xUp?|X0F)`#A&tG#pY
z*u1`5<>E}-uq*atF_&>imiFU<#`Z>98T56sp7vu|V~3@*&?2d`82)HX-R1(F#oN?b
zjB%EXT`Aeq&gn)2Zkl)V<r#C^HK(zGM6-2faPa>K4L;lAt$R)>Q?2MsAhc4^>Ft9q
zZra@FcMA6PStnbZylL>H#S2B)*GR)~HKgL#A{|B6qkWijsRQ+oVFjBDQUt5FB#FfL
z@Zw1*js=&F<93bWSa+!#f0yJAY`Js@^~bV|ghvPQ^qCyT@1LY%!lNGCU!y&!tuYCS
z&*3QevLvDAQ5RC5=m6e(G=hz3Noz|K_tL;gym};t81iWtov%Ym@SG&%eCoroO{So}
zE^E!yqE99sev`ZL<0UEh;*$kFFQTkZkzMC6kEh2jp0f<G5WM*wilM$i@`-3;rFRM?
zr_9r%S4V|HjZWp8dlZ*5TXLH54h8xHIx^Ifw|ot5@rJc=hL>lYf*RdXp-$zisel9|
M0eK}AginqC1NQ5=<^TWy

delta 198
zcmXBMzY76z00r=Pcb8nakfU>(jD9ROgHnE!l$AfiA0QdXMt<DAGs~ciqD&?Wkv~BB
z2W%FD@-4&XEwA_PN8@uadRx~ZJWNJhf_tBgVA*B550$quJbdM3FTZn?`J6yz$3lww
z6j7cm5w$6Td|QaK*M-EW4TIGO!mQg!P;E+n){BadGaEYFA-A7L8(C^IRM;Rg|JjHz
pxj8E;PZaI$0*$(ZJX;Q8T&<-5ua0;&`!I)v1q4Zu_l1R`m3~}XMOgp<

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0b63489f05..2d9d5ee6dcb 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 4ca21d3eaf3..8f5c422ecfa 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -41,11 +41,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 03b58fe3da7..63e332079bc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2